From 2eb236c17e09007ca172219cebeb9c16a73cc3b2 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 20 Dec 2005 18:45:29 +0100 Subject: [PATCH] Remove FIX_RSDP_PAGE. Access RSDP via the 'isamap' of low 1MB. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c | 2 -- linux-2.6-xen-sparse/drivers/acpi/tables.c | 3 +-- linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h | 1 - linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c index 19e71d8d2b..96ee1a68ce 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c @@ -660,8 +660,6 @@ acpi_find_rsdp (void) if (!rsdp_phys) rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000); - set_fixmap(FIX_ACPI_RSDP_PAGE, rsdp_phys); - return rsdp_phys; } diff --git a/linux-2.6-xen-sparse/drivers/acpi/tables.c b/linux-2.6-xen-sparse/drivers/acpi/tables.c index a849e65c85..4abd09de68 100644 --- a/linux-2.6-xen-sparse/drivers/acpi/tables.c +++ b/linux-2.6-xen-sparse/drivers/acpi/tables.c @@ -566,8 +566,7 @@ acpi_table_get_sdt ( * result: sdt_entry[] is initialized */ #if defined(CONFIG_XEN_X86) || defined(CONFIG_XEN_X86_64) -#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \ - (rsdp_phys & ~PAGE_MASK)) +#define acpi_rsdp_phys_to_va(rsdp_phys) isa_bus_to_virt(rsdp_phys) #else #define acpi_rsdp_phys_to_va(rsdp_phys) __va(rsdp_phys) #endif diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h index c2dcf5a33e..caac2e3f7c 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h @@ -80,7 +80,6 @@ enum fixed_addresses { #ifdef CONFIG_ACPI_BOOT FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, - FIX_ACPI_RSDP_PAGE, #endif #ifdef CONFIG_PCI_MMCONFIG FIX_PCIE_MCFG, diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h index 6d429e1175..4da91b46de 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h @@ -50,7 +50,6 @@ enum fixed_addresses { #ifdef CONFIG_ACPI_BOOT FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, - FIX_ACPI_RSDP_PAGE, #endif FIX_SHARED_INFO, FIX_GNTTAB_BEGIN, -- 2.30.2